tenderloin: various mbm and other fixes