Fixes for recent checkin