6801360 Small fixes