Made buildable with latest GHC