More camera-ready changes