Yet more lighting tweaks