Fixes misc AVM1 tests