[gh-23] - Fixed some issues with the fs plug.