more ubuntu bash-vs-sh fixes