Build fix; upgrade to newly release hawtdispatch 1.21