For #390 - some updates to try improving the prelude