Some critical issues fixed