More responsive fixes.