Fix stuff for travis