Fixing various lighting issues

Change-Id: I876406d74678d0da01384184296a729e0c7f45c8