more patching corrections