fixes for avian vm