Try to improve solaris compatability