boost: More fixes / 155 pinning