Fix light issues