Some more RTD specific changes