More final changes