Fixup 0.8 node compatibility