For 1.7 fixes