Fix imports and versions