[draw] Fix draw signatures
8 files changed