Various changes to the Prelude that I found necessary