Finish upgrading to 3.3.