Cm 10.1 chad minor cleanup

A couple of commits that have been hanging around my git for awhile.  Just little bits of cleanup.