Adding in a2's fixes by hand.