Small improvemenets to the File store.