Check-In Fixes