Fixed Cabal build issues