Fixes for makefile (for Travis mostly)