Fixes to checkin