Fixes in makefiles