fixed various problems introduced by a refactoring in the components language before