Fix some error while running 22.3.1