Fix build errors
Convert to plain old make