Makefile fixups

Reviewer: @dtalayco 

First pass. Additional work still required for uCli code.