Fixed component block issues