Fix problems in PROD env