boost changes and header fixes