Fixing Upgrade->GCT data converter