Some more tweaking for RTD