Small improvements to dof and light export