msm_fb updates - part 2 && typo fix