diff --git a/common/route/awooter/rust/src/lib.rs b/common/route/awooter/rust/src/lib.rs
index 9fb57010..8752f913 100644
--- a/common/route/awooter/rust/src/lib.rs
+++ b/common/route/awooter/rust/src/lib.rs
@@ -64,7 +64,8 @@ fn extract_arcs_from_nets(ctx: &npnr::Context, nets: &npnr::Nets) -> Vec<route::
                         net.index(),
                         nets.name_from_index(net.index()),
                     );
-                    if !arcs.contains(&arc) {
+                    if !arcs.contains(&arc) && arc.source_wire() != arc.sink_wire()
+                    {
                         arcs.push(arc);
                     }
 
diff --git a/common/route/awooter/rust/src/partition.rs b/common/route/awooter/rust/src/partition.rs
index dc4bd6b2..7a8cecd8 100644
--- a/common/route/awooter/rust/src/partition.rs
+++ b/common/route/awooter/rust/src/partition.rs
@@ -248,7 +248,7 @@ impl SegmentedArc {
             let src: Coord = src.into();
             (src.segment_from(partition_point).into(), src, 1)
         } else {
-            ctx.get_uphill_pips(arc.source_wire())
+            ctx.get_downhill_pips(arc.source_wire())
                 .map(|pip| {
                     let c: Coord = ctx.pip_location(pip).into();
                     c
@@ -268,7 +268,7 @@ impl SegmentedArc {
             let sink: Coord = sink.into();
             (sink.segment_from(partition_point).into(), sink, 1)
         } else {
-            ctx.get_downhill_pips(arc.sink_wire())
+            ctx.get_uphill_pips(arc.sink_wire())
                 .map(|pip| {
                     let c: Coord = ctx.pip_location(pip).into();
                     c