Some patching touchups