am 76004b48: am 267f1dc1: Fix a number of draft-related bugs

* commit '76004b489d1c91ea3fd823a8fe72c0decbf30f4c':
  Fix a number of draft-related bugs