Makefile: tweaks

Change-Id: Ib5a584502796eab69758f1841ddf552419ed94b1