A few changes for hoard rendering