more fixes to make file