Fixes to __version__ import