Fixes for short UAID/CHIDs

* fix to use uaids < 32 hex characters.
  (I'm sure this is a horrible way to do this. May need to revisit)