Solaris 11 compilation fixes