Small issue fixes to start the hackathon