boost-related fixes