Fix issues with do_rand_init/rand_cleanup_int