Resolved some of potential issues.