trivial fixes + top level makefile

Hi Eric,

Please pull the following changes.

Thanks,
--Prabhakar Lad