Fixes for 3.6.0 on Solaris