Fixes for xavs codec.