More encoded laser fixes