Fixing initial commit issues