Fraser's changes on boost dependencies