Fix few bug