Short name of contest is now unique
Some minor fixes to DB and AWS