Some fixes due to error messages in prod