Fix warning and add diversification for sam av2