More RTD fixes...