Some regression issues fixes

This is what I was able to do in a day. Fixed 4 issues:

- #185
- #186
- #187 
- #190 

More to come, however we need to move forward. 

Will this give rise to other regressions? The original test of this on master branch has `body.empty()`.