Few 1.75 fixes