Add a couple 1.8 wrappers