Code changes and other notes on illumos