Cleaning up errors in spelling/type matching