more randomness fixes