Misc bug fixes to get check-in working with sample data