Bugs in Draw block cleared.