minor tweaks to compile under ghc-783
merge etc.