Puneet fixes to solaris