Change retrieval of components and some fixes.