More post-infobar fix-ups