Fixed several issues related to stores