Fixed few Issues