Final fixes before golive.