Assorted msm changes from Tw KK 4.4.2