Bug fixes and direct/proxy retrieval