Fix: Untangle things a bit