Fixed broken components