Bug fixes and more compo implementations