Some Prelude fixes