Some fixes to makefiles.