some more production fixes