Fixed issues mentioned by Dominique Devienne during Boost review