Fix issues with numbering and randomization (#2/#3).