Fixes for MccID and UserID