Bug 988544 - fix wrapped make functions