More fixes for mutliple entities