More fixes for GHC 7.4