Finish up UUID suppport and fix /load