Fixed various import issues: