Merged in compo vector changes