More fixes to make sphinx tests pass