compilation fixes, makefile