Changes to tools which use rng.h to compile with newly modified rng.h