Fixed Team Room issues