Applied patch
simplify install overrides