Fix some issues with guid generation