Fix crash.
Production setup fixes.