Fixes for Solaris