more fbid fixes