German Hackathon Issue Fixes