Fix toggles and build