diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7aa80d0b..705db4f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@master
+        uses: ignition-tooling/action-ignition-ci@bionic
         with:
           codecov-token: ${{ secrets.CODECOV_TOKEN }}
   focal-ci:
diff --git a/README.md b/README.md
index 8c0f4df3..ebc14aab 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,24 @@
-# Ignition Fuel Tools
+# Ignition Fuel Tools: Classes and tools for interacting with Ignition Fuel
 
-**Classes and tools for interacting with Ignition Fuel**
+**Maintainer:** nate AT openrobotics DOT org
+
+[![GitHub open issues](https://img.shields.io/github/issues-raw/ignitionrobotics/ign-fuel-tools.svg)](https://github.com/ignitionrobotics/ign-fuel-tools/issues)
+[![GitHub open pull requests](https://img.shields.io/github/issues-pr-raw/ignitionrobotics/ign-fuel-tools.svg)](https://github.com/ignitionrobotics/ign-fuel-tools/pulls)
+[![Discourse topics](https://img.shields.io/discourse/https/community.gazebosim.org/topics.svg)](https://community.gazebosim.org)
+[![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)](https://www.apache.org/licenses/LICENSE-2.0)
+
+Build | Status
+-- | --
+Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-fuel-tools/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-fuel-tools)
+Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_fuel-tools-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_fuel-tools-ci-main-bionic-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_fuel-tools-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_fuel-tools-ci-main-homebrew-amd64)
+Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_fuel-tools-ci-main-windows7-amd64)](https://build.osrfoundation.org/job/ignition_fuel-tools-ci-main-windows7-amd64)
 
 Ignition Fuel Tools is composed by a client library and command line tools for
 interacting with Ignition Fuel servers.
 
   [http://github.com/ignitionrobotics/ign-fuel-tools](http://github.com/ignitionrobotics/ign-fuel-tools)
 
-Test coverage reports are available at Codecov:
-
-[![codecov](https://codecov.io/gh/ignitionrobotics/ign-fuel-tools/branch/master/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-fuel-tools)
-
 # Building and installing
 
 See the [installation tutorial](https://ignitionrobotics.org/api/fuel_tools/5.0/install.html).
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 0ccba034..a373e184 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -20,7 +20,7 @@ pipelines:
             libignition-math6-dev
             libignition-msgs6-dev
           # Ignition tools
-          - git clone http://github.com/ignitionrobotics/ign-tools -b master
+          - git clone http://github.com/ignitionrobotics/ign-tools
           - cd ign-tools
           - mkdir build
           - cd build
@@ -28,15 +28,15 @@ pipelines:
           - make -j4 install
           - cd ../..
           # # Ignition msgs
-          - apt-get -y install
-            libprotobuf-dev protobuf-compiler libprotoc-dev libtinyxml2-dev
-          - git clone http://github.com/ignitionrobotics/ign-msgs -b master
-          - cd ign-msgs
-          - mkdir build
-          - cd build
-          - cmake ..
-          - make -j4 install
-          - cd ../..
+          # - apt-get -y install
+          #   libprotobuf-dev protobuf-compiler libprotoc-dev libtinyxml2-dev
+          # - git clone http://github.com/ignitionrobotics/ign-msgs
+          # - cd ign-msgs
+          # - mkdir build
+          # - cd build
+          # - cmake ..
+          # - make -j4 install
+          # - cd ../..
           # Make sure ign-tools can find installed libs
           - export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH
           # Ignition Fuel Tools
diff --git a/src/Zip_TEST.cc b/src/Zip_TEST.cc
index 7adea596..9d70b5e0 100644
--- a/src/Zip_TEST.cc
+++ b/src/Zip_TEST.cc
@@ -16,7 +16,7 @@
 */
 
 // All these helper functions have been copied from
-// https://github.com/ignitionrobotics/ign-common/raw/master/src/Filesystem_TEST.cc
+// https://github.com/ignitionrobotics/ign-common/raw/ign-common3/src/Filesystem_TEST.cc
 
 #ifndef _WIN32
 #include <fcntl.h>