more v4/v6 tweaks