Updated code for Solaris 11.2