Addressing a few of the RTD todo items.