Fix component store references