Various RAND improvements