fix some stuff that breaks default config on dual/multi-head setups