Make it all work on solaris...