Update a bunch of FSS

They are now a bit more idempotent (lol)