a few fixes to request context