minor fixes to recent checkins to get compiling on linux