Changed a few boost bind/function refs to std::bind