fb_jm fixes