Fixing avis errors