SmartOS support plus other minor stuff