Hackathon fixes

This is still whitespace :police_car: