More boost fixes