fix #595 and fix #550

These imports should be up with the imports of other builtins (like `copy`)