Remove compiler warnings for brkfix integration update makefiles

Some things that missed the brkfix integration pull request

Passes test suite.