Three changes to fixes compilation/bugs

Compiled against boost 1.53