Python 3 support: Fix some import directives