PY3: Update imports to be py3k compatible