Some fixes for boost issues