Fix PUOID storage and related stuff