[WIP] 2.8 fixes

yep. fixing it now :)