Light functionality global bugfixes