Minor component state handling improvements
Minor component state handling improvements

niello/deusexmachina,niello/deusexmachina,niello/deusexmachina,niello/deusexmachina,niello/deusexmachina,niello/deusexmachina,niello/deusexmachina,niello/deusexmachina