Fixes to support for Spot Lights