symbol handling/hash fixes