some small fixes in local_store