Fix some more 1.9 changes