Fixes for RVC optimization