RF tweaks based on @andyw-lala's feedback