Fix some bug's