draw fixes