Quote a few things that shellcheck suggests
2 files changed