Some more 1.9 issues