some minor ECS improvements