Fix more ADV/ADVP errors