Minor fixes
Fix imports