Fix more issues with PREFIX in makefile