Fix up build for new toolchain
Signed-off-by: scott <scott@ubuntu.com>