Upadate to last 1.7.10 corrections