Several tweaks.