Random numbers, other fixes