Adapt message center to GMC changes and bug fixing