Check-in bug fixes