Makefile fixes vol. 2