Misc AVM1 fixes

Attempt to fix swiffy example3 and example4