some production fixes