Fix branch issues