Fixing issues.