Adding more missing definitions. Needs 6.5G to load in ghci