Fixed errors with 'filestore' class functionality