minor randomTemplate changes