some more changes for solaris