more solaris compile fixes