Fix Cheeseshop distribution problems

@glow-mdsol  Sorry to bother you. One last time for luck?