Fix makefiles for Travis