Production build fixes