patching some stuff