Fix up entity fetching