Minor, final changes