Sanitize the Makefiles a tiny bit