Minor catchup + c/avx plugins fix/update