[OE-3773] laser bug fixes