delegate fixes