Almost compiles on Solaris now