RIDCOR-17 tweaks