fixes for the hackathon