SmartLight fixes