Some Fixs and scripts