Fix up build with AMD / global wrapper