Extra change to enable clean compilation on Solaris 11.2