More changes for compatibility with readthedocs documentation builder