Improve tmux support