nonsensical build fixes.  As in, it worked in 7.4, now it doesn't in 7.6, and I have no idea why