Fixes for AVL run