Some minor improvements in Makefiles