Committing fixes