Resolved some final issues.