#20 Small tweaks.