-Wall and other cabal fixes