Modfied makefiles