Some fixs