Responsive bugfixes