Changes to work with current Travis Haskell instance