XML and HTTP fixes