Tweaks from shellcheck checking, etc.