Support for Boost 1.55, changes to make Sapphire run smoother