Fixes in formatter and document