Minor fixes
Update makefile