Fixing stuff for Travis