Fixed Makefile
Fix Makefile after move
Fix build on 64bit