And some small changes for travis