Fixes for makefiles