more tweaks to the FileStore.php