Fix various mistakes in prod