Added fixes to commit trouble.