More tweaks from John.