fix-compile-errors
fix-makefile
