Fix spelling typos and error message formatting in cherry-picked code

Co-authored-by: havahol <5363644+havahol@users.noreply.github.com>

Author: Copilot