Fixed some orphan branch bugs