Clean up fs interface a bit