diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 36b9d67..b1b6f3f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,8 +26,6 @@ jobs:
         - nightly-musl
         - nightly-arm
         - macos
-        - win-msvc
-        #- win-gnu
         include:
         #- build: stable
         #  os: ubuntu-18.04
@@ -46,12 +44,6 @@ jobs:
         - build: macos
           os: macos-latest
           rust: nightly
-        - build: win-msvc
-          os: windows-2019
-          rust: nightly
-        #- build: win-gnu
-        #  os: windows-2019
-        #  rust: nightly-x86_64-gnu
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
@@ -76,11 +68,9 @@ jobs:
     - name: Use Cross
       if: matrix.target != ''
       run: |
-        # FIXME: to work around bugs in latest cross release, install master.
-        # See: https://github.com/rust-embedded/cross/issues/357
-        cargo install --git https://github.com/rust-embedded/cross
+        cargo install cross
         echo "CARGO=cross" >> $GITHUB_ENV
-        echo ":TARGET_FLAGS=--target ${{ matrix.target }}">> $GITHUB_ENV
+        echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
         echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
 
     - name: Show command used for Cargo
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 742f4fe..0ad1c1a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -126,11 +126,9 @@ jobs:
     - name: Use Cross
       # if: matrix.os != 'windows-2019'
       run: |
-        # FIXME: to work around bugs in latest cross release, install master.
-        # See: https://github.com/rust-embedded/cross/issues/357
-        cargo install --git https://github.com/rust-embedded/cross
+        cargo install cross
         echo "CARGO=cross" >> $GITHUB_ENV
-        echo ":TARGET_FLAGS=--target ${{ matrix.target }}">> $GITHUB_ENV
+        echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
         echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
 
     - name: Show command used for Cargo
@@ -148,11 +146,9 @@ jobs:
     - name: Set release upload URL and release version
       shell: bash
       run: |
-        release_upload_url="$(cat artifacts/release-upload-url)"
-        echo "RELEASE_UPLOAD_URL=$release_upload_url" >> $GITHUB_ENV
+        echo "RELEASE_UPLOAD_URL=$(cat artifacts/release-upload-url)" >> $GITHUB_ENV
         echo "release upload url: $RELEASE_UPLOAD_URL"
-        release_version="$(cat artifacts/release-version)"
-        echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
+        echo "RELEASE_VERSION=$(cat artifacts/release-version)" >> $GITHUB_ENV
         echo "release version: $RELEASE_VERSION"
 
     - name: Build release binary
diff --git a/ci/macos-install-packages b/ci/macos-install-packages
index 13f4793..9a76760 100755
--- a/ci/macos-install-packages
+++ b/ci/macos-install-packages
@@ -1,2 +1,3 @@
 #!/bin/sh
 
+brew install poppler
diff --git a/ci/ubuntu-install-packages b/ci/ubuntu-install-packages
index 1a24852..fbf4b86 100755
--- a/ci/ubuntu-install-packages
+++ b/ci/ubuntu-install-packages
@@ -1 +1,5 @@
 #!/bin/sh
+
+sudo apt-get update
+sudo apt-get install -y --no-install-recommends \
+    poppler-utils