Updates from prod code.