production issues fixed