Fix issues with light components