More component library fixes and updates