some fixes in production environment