Fixed production issues