INFRA-593: tweaks

Edits from Ramesh on Shared Secret.