Fix some of the checked boxes logic