More fixes for raw body handling.