Fix component and npm support