More fixes for the make file