Light shaft tweaks