more hacky fixes in attempt to get things building.  might build now.