Improve SmartOS support