Some final changes