am 527fcced: Fix a number of draft-related bugs

* commit '527fcced9fe9cf8525e33ffb098fd28650af24af':
  Fix a number of draft-related bugs