minor production fixes