Some fixes due to production environment