Hackathon fixes

Please revert this.