Changes from comments in PR #337
Clean some import warnings