Fix for Makefile refactoring