Fixes for travis build.