Fixes - Stefan-ST's comment