Some fixes for Mani to get integration started.