More bash fixes