Fixing remaining issues.