More PWM changes