Further Yi.Prelude removal fixes