Bugfixes to fit LS Store requirements