Attempting some fixes, nothing addressing the issue of branches ending