Fix compatibility issues for haskell and god