Add some missing draft protection. Fixes #912.