Patches

Fixes some issues that occurred when highlighting `body`.