Fix bugs around multi-player