Fix Draw functions