Build: Fix side-effects after shedding weight