guid bugfixes