Resolved some issues.