Minor changes to random no generation