update GCD wrappers to support 7