Fix bugs in prod.