Localstorage fixes