[COOK-3600] SmartOS support plus other minor stuff