Fixing some boost issues