Update to support building against current HEAD