Fixed hash and list handling