raaz-random fixups