Fix some details in prod