Fix some UF options not being toggled properly.