More production bug fixes