Fixes for Avs for Advoc project