More tweaks and bugfixes after the ECS change.