+ Minor tweaks to actor/components