Fix some subsystemid statements in r6421