More import fixes
Merge pull request #218 from Winnetou/patch-17

More import fixes