more Responsiveness fixes