Moving government-related fixes to subscripts