added production fixes