Fix wish entity and resource