Fix some issues around Bash button