More package fixes for GHC < 7.8