Misc AVM1 fixes

Good catch, thanks