Adjust some version bounds in scaffolding