Fixed critical issues.