Misc fixes for Travis