Fixes for component registration