Makefile fixups

Reviewer: @dtalayco