More tweaks for RTD.