Fixes to accomodate GHC version 7.8.3