Small tweaks to RV module (no functional changes)