Some fixs for the hackathong