Fix previous patch errors.