WIP sysroot fixups