BaseLight.h fixes