Fix ind and bmc messaging