Committing fixes.