Use new import alias syntax
Fix some deprecations