Fixes for clean build

Make some minor changes to recent checkins for clean build on another
system type.