Fixed minimal XDS issues