Fixed few Issues !