Updated random calls to use static rand object