diff --git a/Data/VectorSpace/Free.hs b/Data/VectorSpace/Free.hs
--- a/Data/VectorSpace/Free.hs
+++ b/Data/VectorSpace/Free.hs
@@ -3,7 +3,7 @@
 -- Copyright   : (c) Justus Sagemüller 2016
 -- License     : GPL v3
 -- 
--- Maintainer  : (@) sagemueller $ geo.uni-koeln.de
+-- Maintainer  : (@) jsag $ hvl.no
 -- Stability   : experimental
 -- Portability : portable
 -- 
@@ -58,7 +58,7 @@
 import Linear.V4
 import qualified Linear.Affine as LA
 
-import Control.Lens ((^.), FoldableWithIndex, ifoldr)
+import Control.Lens ((^.), FoldableWithIndex, ifoldr, Lens')
 
 import qualified Data.Foldable as Foldable
 
@@ -94,7 +94,7 @@
 instance (Num s, AdditiveGroup s) => HasBasis (v s) where {     \
   type Basis (v s) = L.E v;                                      \
   decompose = vDecomp;                                            \
-  basisValue = L.unit . L.el;                                      \
+  basisValue x = L.unit (L.el x :: Lens' (v s) s);                 \
   decompose' w (L.E le) = w^.le }
 
 portFinDV(V0)
diff --git a/Data/VectorSpace/Free/Class.hs b/Data/VectorSpace/Free/Class.hs
--- a/Data/VectorSpace/Free/Class.hs
+++ b/Data/VectorSpace/Free/Class.hs
@@ -3,7 +3,7 @@
 -- Copyright   : (c) Justus Sagemüller 2016
 -- License     : GPL v3
 -- 
--- Maintainer  : (@) sagemueller $ geo.uni-koeln.de
+-- Maintainer  : (@) jsag $ hvl.no
 -- Stability   : experimental
 -- Portability : portable
 -- 
diff --git a/Data/VectorSpace/Free/FiniteSupportedSequence.hs b/Data/VectorSpace/Free/FiniteSupportedSequence.hs
--- a/Data/VectorSpace/Free/FiniteSupportedSequence.hs
+++ b/Data/VectorSpace/Free/FiniteSupportedSequence.hs
@@ -3,7 +3,7 @@
 -- Copyright   : (c) Justus Sagemüller 2016
 -- License     : GPL v3
 -- 
--- Maintainer  : (@) sagemueller $ geo.uni-koeln.de
+-- Maintainer  : (@) jsag $ hvl.no
 -- Stability   : experimental
 -- Portability : portable
 -- 
diff --git a/Data/VectorSpace/Free/Sequence.hs b/Data/VectorSpace/Free/Sequence.hs
--- a/Data/VectorSpace/Free/Sequence.hs
+++ b/Data/VectorSpace/Free/Sequence.hs
@@ -3,7 +3,7 @@
 -- Copyright   : (c) Justus Sagemüller 2016
 -- License     : GPL v3
 -- 
--- Maintainer  : (@) sagemueller $ geo.uni-koeln.de
+-- Maintainer  : (@) jsag $ hvl.no
 -- Stability   : experimental
 -- Portability : portable
 -- 
diff --git a/free-vector-spaces.cabal b/free-vector-spaces.cabal
--- a/free-vector-spaces.cabal
+++ b/free-vector-spaces.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                free-vector-spaces
-version:             0.1.5.0
+version:             0.1.5.1
 synopsis:            Instantiate the classes from the vector-space package with types from linear
 description:         The <http://hackage.haskell.org/package/linear/ linear> package offers efficient
                      vector types — where vector means /element of a free vector space/, i.e.
@@ -35,7 +35,7 @@
 license:             BSD3
 license-file:        LICENSE
 author:              Justus Sagemüller
-maintainer:          (@) sagemueller $ geo.uni-koeln.de
+maintainer:          (@) jsag $ hvl.no
 -- copyright:           
 category:            Math
 build-type:          Simple
@@ -53,10 +53,10 @@
   other-modules:       Data.VectorSpace.Free.Class
   -- other-extensions:    
   build-depends:       base >=4.6 && <5.1,
-                       vector-space >=0.11 && <0.13,
+                       vector-space >=0.11 && <0.18,
                        MemoTrie,
                        linear >=1.18 && <1.23,
-                       lens >= 4 && < 5,
+                       lens >= 4 && < 6,
                        vector,
                        pragmatic-show >=0.1.2 && <0.2
   ghc-options:         -O2