Fixed some bugs with weird branch names