Update to latest floq and 2.1