Reordered SmartOS specific changes