Entities fixes.