BUGFIX Client id spec fixes