Merge "Fix critical issues"