some more build fixes

now i'm really-really done

really

review by @paulp