More work on fs plugs