Small tweaks and proposals.