Fixing the rest of the issues with entities.yml