Minor final changes