Some fixes to .tmux.conf.ma*