multiple checkin bug fixes