Haskell version + Makefile fix