Some more 1.8 compatibility changes