Fix imports, update dependencies