Patch errors in other commits.