Fixing up stuff for Travis