Fix some problem