Minor fixes on check-in