entity tracking fixes