bash: more fixes from upstream