Fixes for the body parsing issue