Couple of fixes to the non-recursive make build.