Fixed AVL warnings