more production fixes