Fix draw bugs