ticket:1 Makefile fixes