Fix integration of XS containers