Even more ASDF3 fixes