Fix component construction