Resolved remaining issues.