Fixes for kiyan's comments