More final updates