More minor adjustments for production