Fix remaining settings rebase derps