Prodcution fixes