more fixes for solaris