Changes to fix autodoc - need to test with ReadTheDocs still