Resolved some bug issues.