#6690 Small Corrections