diff --git a/.appveyor.yml b/.appveyor.yml
index ddccbe0..be9344f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,7 +5,7 @@
 image:
   - Visual Studio 2015
   - ubuntu1604
-  - ubuntu1804
+# - ubuntu1804 broken lately
   - ubuntu
 
 environment:
diff --git a/.travis.yml b/.travis.yml
index 372f882..b1a6b2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ perl:
     - "5.22"
     - "5.24"
     - "5.26"
+    - "5.28"
+    - "5.30"
 
 before_install:
     - git clone git://github.com/travis-perl/helpers ~/travis-perl-helpers
diff --git a/README.pod b/README.pod
index f52d70d..d70e31c 100644
--- a/README.pod
+++ b/README.pod
@@ -2,19 +2,19 @@
 
 =encoding utf8
 
-=for HTML <a href="https://travis-ci.org/briandfoy/returnvalue"><img src="https://travis-ci.org/briandfoy/returnvalue.svg?branch=master" /></a>
+=for HTML <a href="https://travis-ci.org/perlreview/returnvalue"><img src="https://travis-ci.org/perlreview/returnvalue.svg?branch=master" /></a>
 
-=for HTML <a href='https://ci.appveyor.com/project/briandfoy/returnvalue'><img src='https://ci.appveyor.com/api/projects/status/u29cjg7a4ypl8n3i' /></a>
+=for HTML <a href='https://ci.appveyor.com/project/perlreview/returnvalue'><img src='https://ci.appveyor.com/api/projects/status/95l4kfg5aciiyq2a?svg=true' /></a>
 
-=for HTML <a href='https://coveralls.io/github/briandfoy/returnvalue?branch=master'><img src='https://coveralls.io/repos/github/briandfoy/returnvalue/badge.svg?branch=master' alt='Coverage Status' /></a>
+=for HTML <a href='https://coveralls.io/github/perlreview/returnvalue?branch=master'><img src='https://coveralls.io/repos/github/perlreview/returnvalue/badge.svg?branch=master' alt='Coverage Status' /></a>
 
-=for HTML <a href="https://github.com/briandfoy/returnvalue/blob/master/LICENSE"><img src="https://img.shields.io/cpan/l/ReturnValue.svg" /></a>
+=for HTML <a href="https://github.com/perlreview/returnvalue/blob/master/LICENSE"><img src="https://img.shields.io/cpan/l/ReturnValue.svg" /></a>
 
 =for HTML <a href="https://metacpan.org/pod/ReturnValue"><img src="https://img.shields.io/cpan/v/ReturnValue.svg" /></A>
 
 =head1 The ReturnValue module
 
-This is the I<README> for the L<ReturnValue> Perl module. You're probably
+This is the F<README> for the L<ReturnValue> Perl module. You're probably
 looking at this because you don't know where else to find what you're
 looking for. Read this once and you might never have to read one again
 for any Perl module.
@@ -36,8 +36,8 @@ You can read the documentation and inspect the meta data at
 L<MetaCPAN|https://metacpan.org/pod/ReturnValue>.
 
 The standard module documentation has example uses in the SYNOPSIS
-section, but you can also look in the I<examples/> directory (if it's
-there), or look at the test files in I<t/>.
+section, but you can also look in the F<examples/> directory (if it's
+there), or look at the test files in F<t/>.
 
 =head2 Installation
 
@@ -66,18 +66,18 @@ module and only want to run the tests without installing anything.
 =head2 Source location
 
 The meta data, such as the source repository and bug tracker, is in
-I<Makefile.PL> or the I<META.*> files it creates. You can find that on
+F<Makefile.PL> or the I<META.*> files it creates. You can find that on
 those CPAN web interfaces, but you can also look at files directly in
 the source repository:
 
 =over 4
 
-=item *	L<https://github.com/briandfoy/returnvalue>
+=item *	L<https://github.com/perlreview/returnvalue>
 
 =back
 
 If you find a problem, file a ticket in the L<issue
-tracker|https://github.com/briandfoy/returnvalue/issues>:
+tracker|https://github.com/perlreview/returnvalue/issues>:
 
 =over 4
 
@@ -102,7 +102,7 @@ Problem|http://archive.oreilly.com/pub/a/perl/excerpts/9780596527242/brians-guid
 
 =head2 Copyright and License
 
-You should have received a I<LICENSE> file, but the license is also noted
+You should have received a F<LICENSE> file, but the license is also noted
 in the module files. About the only thing you can't do is pretend that
 you wrote code that you didn't.