Fix the issues in the HStore.