classy-base-prelude fixes