sh: misc changes