Fixing commit/sync errors