Fix comments and GPO data table attributes