Bear entity fixes