More fixes for sub requests.