Various quoting fixes as suggested by shellcheck