More rubby 1.8 fixes