Merged randre fixes