Step commit. Fixing issues.