Compile update

Make it compile on Debian Jessie and with current GHC.