Fixes for draftmanaging