Minor fixups
Add initial support for requesting context with results