Fix build error and add moar toggles