Fixing long time #solaris issues at #illumosday