Light bug fixes