Fix all remaining issues.