Some 1.7.2 fixes