Patch common dir and ensure tunnel types not set