Misc AVM1 fixes

I'm speechless.