Extra fixups to Makefile.

Signed-off-by: Kieran Colford <colfordk@gmail.com>