Fixed compilation errors and typo in Makefile

Signed-off-by: Mike Lewis <mikelewis@alphalem.com>