Hackathon fixes

Please don't remove the newline.