Some small fixes and improvements for Lightstalker