Fix shit (see diffs).

Enderman is broken until further notice.