Address some shellcheck notes