Fixes for Travis CI build