Makefile fix + performance fix