Fix hash for Address type, some clean up for builtins