Post compo bugfixes