Support for the home store. Random fixes