Minor fixes for travis