Fixed up random/shuffle support