Fixed some hash issues