[COMMIT] Allow Manual-switches to be set sensibly