Fix bugs in competition