small entity fixes