Resposivity fixes