Fix imports
Fix type inference issue