Dual stack fixes