Some fixs and refs