Decoupled throttle + Decouple fixes