Check-in role fixes and style fixes