fix up a bunch of linux build brokenness. #2163