Additional changes as per review comments.