Fix boost usage
Fix solaris issues