Fix several book formatting issues (Fixes #2204)