fixed dic blocks, components and helpers