More entity validation + update stats.