minor fixups to recent checkins