Small tweaks for the RN