Lots more illumos build fixes