More forgiving mate/gitx scripts