Fix some thing