Fix various import issues, including Issue #50.