Fix some rare circular import issues when run under apache.
Version bump to 0.2.26