More small fixes for prod