Changes for solaris