Update up to changes in fs2