Fixed various issues.
Few minor fixes.