Production release fixes
Production release fixes