Patch for minimal fixes