Some changes to make HDRi work