Various tweaks, etc.