More fixes on content global settings migration