fixing several broken __hash__ methods