more fixup attempts
related build fixups
again