Fixed few detail issue