Fix new shellcheck errors caught by latest version