Add a couple of type signatures. Apparently GHC 7.8 can figure them out anymore