more 1.8 fixes

@guilleiguaran