last round of native build fixups