Fix few mistake