Fix some bug in 2.5