Fix idle state issues.