Boost fixes