Fixed three guid related issues.