More responsive fixes