Fix some runtime issue in 3.0