Fixes and checkin format