Bunch of fixes

I'm not sure. There's no reason we *couldn't* implement the fallback, but it's certainly simpler without it. I'll just remove it, it's a pain anyway :smirk_cat: