fix makefile and one more c++ issue