Fixed up active-branch and stuff.