Some more laser fixes