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

* commit '267f1dc1200aeb6a7738202ef5025ee6b81310ea':
  Fix a number of draft-related bugs