Fixing broken branch stuff