Fixes for GHC 7.6.2