Tweak RequestContext code + warning