Merge pull request #277 from brodybits/quick-ci-fixes

Quick CI fixes