A couple of fixes to filesystem and local adapter