More fixed and performance improvements #SCL-5472 Comment