Hackathon fixes

What does this do?