Addition 1.8 fixes