More responive fixes