Fixes to RF due to recent changes