Tweaks for camera-ready version