minor fixes to recent checkins