A few minor TiCo integration bugfixes