Fixed a few import/attribute errors
Fixes #5