Minor fixes and improvements in makefiles
Merged files