Applied old patch: 393fcf5 Fix miscellaneous typos - tests now run!