Small updates for GHC 7.6.1