Some more small tweaks.