Further small changes to attempt to get rtd to work.