A few makefile fixes