Some updates on Makefiles