Fix Makefile + bugfix