Solaris: more build-fixing