Book formatter fixes