Fix some prelude issues