fixes to makefile due to removal of export