Fixes to initial check in