Fixes for Boost.Optional changes in Boost 1.56, and other minor changes