Update for recent checkins