Few Fixes - Compared to other pull request