More boost fixes.