Fixed issue from the last commit...
Few small additions...