Drafts fixup

Fixups on top of #769. Work in progress.