Resolve some production build issues.