1.8 and 1.9 syntax fixes.