2 more Solaris fixes