Fix some of bugs