Added: Makefile adjustments