Second wave of responsive fixes