Yet Another UUID+NA/junk fix