Fix some bug
fix bugs.