Fixes for Solaris 10