Fix some bugs with some bug left.