Add fixes for body contents of unexpected types