More lighting bug fixes