more patching stuff