additional fixes
Merge pull request #315 from Kixo/REDCORE-241_fixing_component_iterator

additional fixes