more 1.8.7 syntax fixes