More work to make things happy on SmartOS plus other tweaks along the way

to ensure everything is still happy on ubuntu and centos.