Some Fixs