[WP] InterConnection Fixes