Some general tweaks.