last fixes for stores