entities fixes