Small fixes in CudiBundle