Small fixes to BasicEntityCollection