fixes for solaris