Small fixes for travis