More tweaks and cleanup for travis build.