Committing the fixes.