Commit fix critical bugs