Fixes for some random variable warnings in certain scenarios.