Fixes from shellcheck