bug fixes from guid transition