Some fixes in CudiBundle