Minor improvements to partitioning and welcome modules