Fixes from shellcheck feedback