OP-1476 - Makefile fixes from review