Bugfixes to match the requirements of LS Store