fix Makefile error, fix for warnings