Fix some disposition