small fixes to entity and task