Fix some bug at compatability