add a bunch of stuff that works with 2.8