fix some hashmap issues