"sorry, old army habit. Noticed your organizational pin upside down / jacket tail caught in your waist band / road salt smear on your pants / decorations,medals a bit askew...." Kept light and conversational, those few times they are appreciative. No comments about what worn and not ever about right-wrong.
The kilt pin incident sounds like it went well, and someone's self esteem and kilt all the better for it in the long run.