Hackathon fixes

Why was this needed?