Several minor tweaks