Code changes and notes for illumos