Fix imports errors