Fixing some shellcheck violations