More fixes for the lighting bugs