Team placement and water tile fix